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

Change-Id: If0997087acd6a621661541f96b0fe55008ab8415