[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: cf6bcd2526
am: 43189be92d -s ours
am skip reason: subject contains skip directive

Change-Id: I74991bf29598fc4ea96ee50cf45dc6640585078b