[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 18fb7900d5 -s ours am: 3d52cdcf28 -s ours
am: 84b48b3af9 -s ours
am skip reason: change_id I07ec5f5cdc33f8a57628e8d6f6d95bc47c543979 with SHA1 3e7539d5e7 is in history

Change-Id: Ifa73bd99b30048d7cba402ada90439351f6a02a6