[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 7c11befc89 -s ours
am skip reason: change_id I859ac505f3b7d0ae307d42d902b7a1c8fd185f59 with SHA1 c3f5bfaf4c is in history

Change-Id: I27d48ddcdf187e4773c2f0a2a97430e0c06bf876