[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 74ded0e478 -s ours am: c377f74feb -s ours
am: 529cc2a059 -s ours
am skip reason: change_id I53ab66dd32b7a69f04226fccfdf372a66489964a with SHA1 9fd09c85a6 is in history

Change-Id: Icdcd2cd7df0ecaa0ee35f8e432aca81e6bbcb55f