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

Change-Id: I3056dd82f558502b57da97eca4524d5332f3ae5f