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

Change-Id: I5f4d62a9e9c10df93f5b6d99a052aa37e99d25b9