[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b3b43be5 -s ours
am: 4b1e7511 -s ours
am skip reason: change_id I8a2c42ff322242f08fd6601536c3f9ee50d0f633 with SHA1 02ea8f49 is in history
Change-Id: I272e0a384d779128d4b182e03b34abff5d345b7b