[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: a2d09fb45f -s ours
am: 7971307104 -s ours
am skip reason: change_id Id46d6370b1569ed342f5e31e36c98fa78f256c9a with SHA1 b511c7d025 is in history

Change-Id: If356ca0345bb2a39f6db2c44a66babe007ec9109