[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 6c67d74fe8 -s ours am: c3ec6b92f1 -s ours
am: 2a875fa426 -s ours
am skip reason: change_id Ia5466de6366f31b03766f784d6e54447d91ee63c with SHA1 91666364ec is in history

Change-Id: Ia0b0ded110463f8489bea82fff38272f6af51d5e