[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: bc83bd587d -s ours
am: d7268ec512 -s ours
am skip reason: change_id Icbaf441856fdb679ae45c570931faa7b636626e8 with SHA1 b8b38f08cf is in history

Change-Id: Ib35edbe43865aada9824e48bff8ea3111aff3338