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