[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 6e5dc84449 -s ours
am: 85a936c4c4 -s ours
am skip reason: change_id I4a702cb841740ff86f0ecb643a2449724be9d22b with SHA1 60e3d6fc0f is in history

Change-Id: I9e2f358808b6c78e27b4c0a2890ea8373f70135a