[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 1d5442ebc3 -s ours
am: 8e987276d4 -s ours
am skip reason: change_id I00ae5b96433b662309abec72ba7475d543a0031a with SHA1 9e24f6bf78 is in history

Change-Id: I47ced47c11dbfc6ce9d48813d82fe4a56071d03c