[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 6c28d654bf -s ours am: 25621aa51c -s ours
am: 0820a689f5 -s ours
am skip reason: change_id I6ad0c778bc41072fe1f411ba45a4cddb635c91cc with SHA1 2e2b1e7c1e is in history

Change-Id: If8c1cd049077e2262b3b7abb1153ca6be3ccdc53