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

Change-Id: I4b826166187922d859221728478aa652f3247355