[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 76cc73e9 -s ours
am skip reason: change_id Ied9a812f235e2a5146381b0ac8c602db1c6035f5 with SHA1 b9a4f9ef is in history
Change-Id: I08a6fdfc52fd03db3b0b159c5629164751e0610a