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

Change-Id: Ia11334ef51b48527f31744e44d1a272657a67cef