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

Change-Id: I556dbe57a70ae123782e6c56411671f9ad2af016