[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 9e4f79f5ff -s ours am: 67f647ee7a -s ours
am: fc75a8f484 -s ours
am skip reason: change_id I0cddc58644ab80a4e10b52d9df8c7ecdecce2519 with SHA1 8338a4e720 is in history

Change-Id: I448a30cc3d51c9531ef9ee987cc46c8a3a2ec305