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

Change-Id: I94fb532ec0da02e454f57c121b3ce06ea05fdacc