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

Change-Id: I4627986fb183fc78e9fdb2ef60ca6a0d334fb816