[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 3c1edc620c -s ours
am: a85b16a8f9 -s ours
am skip reason: change_id I27571e65a8dcc632f538969dde42a4e99ae3a487 with SHA1 53ea2a0a7b is in history

Change-Id: I0c4747841be44391b5aa8972626f8db4dbef34b4