[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: f0f67dcb02 -s ours am: 50acf531fd -s ours
am: 66b20a0985 -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2dc is in history
Change-Id: If5a586bea80fdb2686dab282a43b5015fef1f975
This commit is contained in: