[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 8166180fd8 -s ours
am: 61f109585e -s ours
am skip reason: change_id Ia2e8a99a24165a08d0c608efcb02c144ff3d909b with SHA1 2caf20ff25 is in history

Change-Id: Iba13728af9b8d0a0cc9d0bfabc5f89841f8924d9