[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 86b1142bce -s ours
am: b9008178cd -s ours
am skip reason: change_id I62ad120c35080783e9fe7f017f2508ecbc85e4cb with SHA1 ff81f9e2b9 is in history

Change-Id: I6afe63cf3e2a26cacaab4d4c5c3deaa5fb0bc9af