[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 53cad795c9 -s ours am: 428b467663 -s ours
am: ac0c26af76 -s ours
am skip reason: change_id Idc05da05ba506ef82c18bde571bc95171f0a7e2b with SHA1 38ed224625 is in history

Change-Id: I774242df0f4d6ddc01077de5166060063eb743d5