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

Change-Id: I5737c9310055502c4736dd58b38137e4119be833