[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: f581705105 -s ours
am: 81e13462d1 -s ours
am skip reason: change_id I3719ce465d2bc67977ea615065d1b7184333b53c with SHA1 fdc2bafdf7 is in history

Change-Id: I63c8e47dbc8fd884076364da4e52774a61022c5d