[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 70062c794d -s ours
am: 8da20188e7 -s ours
am skip reason: change_id I62d6a71195c41e274260a6185b18a46920da81cf with SHA1 5e2ebe61f5 is in history

Change-Id: I88a094742572e6ea31eb03a31eb5d54d2dc1b6f0