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

Change-Id: If72523f9274ccf169890661197a67b2df0fd835a