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

Change-Id: Iefb108f79f05f676d41c613ea3a9009a285985c9