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

Change-Id: I0c7eeef2ca93d9b57b47ac7a06110889bd743a0c