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

Change-Id: I4ccdfa974b002f5e03b4fd7fa48e6e1ccdcf6cce