[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: ef9edb4e -s ours
am: c7b2749a -s ours
am skip reason: change_id Ie5129af19ac790185b7cd6cb59f952244d40832b with SHA1 fe4fc82f is in history
Change-Id: I3760cb071906696abf2cc222f07abc5581551256