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

Change-Id: I129cf252d382ae4f178361a61f0e380bad98718f