[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 7ad00e8a47 -s ours
am: 9c6f13b115 -s ours
am skip reason: change_id Ia1a385c5de9cc97dadb3aeb0482c4f0ce9803573 with SHA1 848d8deb28 is in history

Change-Id: I33f920646c4f25b6b3f665e0f408d6ac47a1adfa