[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: 5eb20c76 -s ours am: d6d91e98 -s ours am: 78e88131 -s ours
am: dc81397d -s ours
am skip reason: change_id If08a6df74ad9ee5281ff1eb283edf8979637ddf2 with SHA1 ec7e3f4a is in history

Change-Id: I3b8ca5346cd6bd81936483ec99393eb906127724