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

Change-Id: Ia9de5f737be67eeff90cbd7f5a5b43e58d0cb3a7