[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b003eb8193 -s ours am: cf76917e7c -s ours
am: 1e1d0acf64 -s ours
am skip reason: change_id I97bbdae04e76ce32de0c25ed580b95ef2ec9a5ee with SHA1 048a25a0e6 is in history

Change-Id: Ic136d2bac2a49bed1db21be511cca8103fcca6e4