[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: 6a5fab707b -s ours
am: 9a2f1dc9ea -s ours
am skip reason: change_id Ied9a812f235e2a5146381b0ac8c602db1c6035f5 with SHA1 b9a4f9efdd is in history

Change-Id: I68209852e088000de071bc231bd8a2ab7e353d49