[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: cee34c6956 -s ours
am skip reason: change_id I3fd7354126a25fa38a84787543bf85032f7c5201 with SHA1 34b83c105d is in history

Change-Id: I63b59a21ae1bd0894787cec821a6b86e3dea0d2a