[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 8aa679f481 -s ours
am skip reason: change_id Ib09a80be728bf688d59861e0d37a5a7b89b8f9bc with SHA1 b24826c6e5 is in history

Change-Id: I1afab84c0215293ca67f3878cbb86ecee5d95760