[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 1bf16a7d -s ours
am skip reason: change_id I051470350ba70a77ec5d78ab5cc9ff02bf4aa4b2 with SHA1 73c51b4a is in history
Change-Id: Ia5f95fca03430916ae0091c4cb6e87f7f2d326a2