[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 8e2e5a774f -s ours
am skip reason: change_id I963225854cfc4a202d9b9829373a3de7e47d96a7 with SHA1 ed6274e426 is in history

Change-Id: Iaa2bde6f16fbe8e01da0691ca5dd370c55c5812a