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

Change-Id: I3592f648d577ceb642bdc7da3d1e7629876f2605