[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 4a1e28939f -s ours
am: 7c4f70d451 -s ours
am skip reason: change_id I5f120ee1df2417c332667e6fd5d87d83e1ca0d0e with SHA1 64512c14ee is in history

Change-Id: I78dd644328fb7164e7618f90ec10cfce5b6d35c8