Merge "[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: fe93bffd -s ours am: 3915b78a -s ours
am: bf48b1d5 -s ours
am skip reason: change_id Ia510468f4a1552d9352874354ba1b5f7c554cfb9 with SHA1 7b2a003f is in history

Change-Id: I9ac0d1ecbab25b9c514ca83dee325ef8666ecd5a