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

Change-Id: Ie166207e79cc23e6db6158eb30aa9a5ccec6d2a5