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

Change-Id: I0a655b3eb36492007b66c0c8c509187b78d59e52