[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: a6b44cc4 -s ours
am: fbab1d91 -s ours
am skip reason: change_id I62fbdaa466973145ddd98a0b88fdb500fad84a02 with SHA1 728c412a is in history
Change-Id: I1ed7729abbd240ff93de81c5c8d8d146abcff4ab