[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 297df67e28 -s ours
am skip reason: change_id I7f92dfad9cb6bb2a5f618a9302d511891b0112be with SHA1 dbae23c582 is in history

Change-Id: I4ba34680583a01f5160c4207a162afb48d274196