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

Change-Id: I2e2399a5f8ffa7526907129a400affa413c2dffa