[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 8dd8ef1112 -s ours
am: b78ef5fd14 -s ours
am skip reason: change_id Ia2a07934c5148da075556e78a0bfbed78ae871cd with SHA1 b69a6b416b is in history

Change-Id: I95fc3f1dc3a28f812683778e9531c8c1413198f3