[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 3d6bb4841a -s ours
am: 2e2f1b97ef -s ours
am skip reason: change_id If650b6aec14985233054bd9017b1e84608b574d5 with SHA1 d7e0bad295 is in history

Change-Id: Ic37430deca493815180f67b359f021bbeeba317f