[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 18b9201c34 -s ours
am: dca0437cfb -s ours
am skip reason: change_id Ic655324c52447411209c7ab8c225af31e3f92241 with SHA1 96f07d819b is in history

Change-Id: Ic0c7e1d8d09663d1e13e3637623158d686b25f4b