Merge "[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 63b283ef48 am: 522d6226fc -s ours am skip reason: subject contains skip directive"