[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b13f817b -s ours
am: c19c2db7 -s ours
am skip reason: change_id I888fee03478bbf90a37cd9a905c49de614cc99ff with SHA1 8e5f4c19 is in history
Change-Id: I8f9aa869f07798fafed99d6a2ebc63846afbff79