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

Change-Id: I2ac1df278327732282e4ba305a4bba87bdfd03e9