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

Change-Id: I3a6d30448b2248807a5edf579f72bb6ed885b75e