[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 74f7f81de0 -s ours
am: d15578838d -s ours
am skip reason: change_id Iee54a2d226deff786a190480b6ca1d6f7424992c with SHA1 091e3281db is in history

Change-Id: I5db02ac27c594624f0c2a3278cc911433912e182