[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: c9472cbf57 -s ours
am: 18c3347fd2 -s ours
am skip reason: change_id I54fe874f7ecb483154c860283ad3bc825563f9db with SHA1 c0ecbe0a8e is in history

Change-Id: If7fd08cc67249f9eaafdaf9ad5a86159414b3069