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

Change-Id: I48b22c6b9fe5e8bf4559bea03549a12adf7167e7