[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: abf6afdc -s ours
am: 1be4d50c -s ours
am skip reason: change_id I6f788cb4c7328e4f2315e4f028e2dd53badeb6cd with SHA1 a0d2141f is in history
Change-Id: Iefcf8f1813c8ee9c1f6706da4a841bee583b6656