[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 81c7420245 -s ours
am: 3a8c498370 -s ours
am skip reason: change_id I201f79c31638100197e93392b2404efcb68eaace with SHA1 fc2114db73 is in history

Change-Id: I5f8d1b3173c521b2bd24dcaf7b072ea6fd806017