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

Change-Id: I672892ebb1ec15974f13c02d6078f751c81d30ab