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

Change-Id: I29df462502b7ab78af5ad23ae28398904ccff6b9