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

Change-Id: I1ad87f25412d92291b2d1bc97f8bd0b40848f31a