[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 0f9628e779 -s ours
am skip reason: change_id I25f008250afbb638f1d450f105edc330b30030f3 with SHA1 d28f2210ee is in history

Change-Id: Id6eb0410d5f68678cd49af9f8e426170a14658f4