[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 68ed8787e7 -s ours
am: cb7ffea073 -s ours
am skip reason: change_id If67ec7501d6624c60376ef35744dc55efcef7c75 with SHA1 f3d14b938c is in history

Change-Id: Ic5e8e17cc38ff74fa6f07c549ec14fa2922a717c