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

Change-Id: Id1401c96f02d9c0aed35358e0ffdf2ebb6f0e1f8