[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 0f24028d66 -s ours am: e5c19ce0d5 -s ours
am: b0558dada3 -s ours
am skip reason: change_id Icca1852f77cb4cc70efa1f6ec95acfe013f8aac3 with SHA1 06df218bfc is in history

Change-Id: Ied1788eb26c63daaa1f061d706902e589c834b2f