[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 6e4ebc8b30 -s ours
am: 589cea9c4c -s ours
am skip reason: change_id Id59b59f4e91e6f7e140bd74863345a51d7f8feef with SHA1 d4372873b6 is in history

Change-Id: I6bb6f152c88354ef83c66182714f8195cd7e7ff8