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