[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: a7d36a42 -s ours
am: 97d59b75 -s ours
am skip reason: change_id I64a01331273216829533f69f4422036e5598a547 with SHA1 c12771af is in history
Change-Id: Ie4b6c46ce7d9ea732fde3e87b8c3e545c88ab8ab