[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: aac7f8e2 -s ours
am skip reason: change_id Idcc078c0e541c04633db6d94c613ac4c861ba963 with SHA1 7195e05d is in history
Change-Id: I7826eee6fd99a83bf4e8a96bb51f0622fbdf84c3