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

Change-Id: I974d4f266432d2ad366353a667f91afd34c6cec4