[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 4874aace15 -s ours
am: ad24d0644d -s ours
am skip reason: change_id I8a07a2e852b9003de35997cd5d3a7bb340a079db with SHA1 6f92a637bd is in history

Change-Id: Ia141511dd2bd49b876b28e505a51c87368fe1f5c