[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612)...

[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: 3113b3fc -s ours am: e4384f8c -s ours
am: a65e5469 -s ours
am skip reason: change_id Ia510468f4a1552d9352874354ba1b5f7c554cfb9 with SHA1 7b2a003f is in history

Change-Id: I8635800fe87eea70ff6f7cd63bbdfde34c0d58b8