[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into...

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 1bf16a7d -s ours am: f2c2dfd1 -s ours
am: 2bc84c4c -s ours
am skip reason: change_id I051470350ba70a77ec5d78ab5cc9ff02bf4aa4b2 with SHA1 73c51b4a is in history

Change-Id: I194e01a9c88af4d0d349d05533699be93a2de2f1