[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 5aed6edf -s ours
am skip reason: change_id I610562bf252cbc98545e5d49c58e9ddce13f7872 with SHA1 a8027c94 is in history
Change-Id: I6866f3d9d1d04a4220af8900d9896f60dbec4b70