[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 5eb20c76 -s ours
am: d6d91e98 -s ours
am skip reason: change_id If08a6df74ad9ee5281ff1eb283edf8979637ddf2 with SHA1 ec7e3f4a is in history
Change-Id: I3ec7412eb09a1801debfda49dcac5453e96bd2df