[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 7e7a87396e -s ours
am: 6ccb05cc41 -s ours
am skip reason: change_id I345a581282c3c24facefef95df3d57e898783b31 with SHA1 87f022ecf3 is in history

Change-Id: Icf383841908aada2e8d07872abd6ffc233768920