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

Change-Id: I0edaafa2f226724cf90fac3dccbbb31f334f766b