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