[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 01d1f3942f -s ours am: 6f082c6d5d -s ours
am: 796f8f2da1 -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2dc is in history
Change-Id: I712ca737683eb8ecf584fdfbdf0378afce7fa0ca
This commit is contained in: