[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d69430249d -s ours
am: e5eb582943 -s ours
am skip reason: change_id I7624257e4cffc690f0df4c844b23cd2accddca4b with SHA1 105542679f is in history

Change-Id: Ie6f217bd119e850ce3d34ab9829f3a686e48259b