[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 568bd269d4 -s ours
am skip reason: change_id Ie7c7af1927cfb1178b491c32fc6f7d0bb8005f7a with SHA1 66de894915 is in history

Change-Id: If118786050655d0ada319fd4f33170cc6d7837b5