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

Change-Id: I1653bd6319ee53cdc481db3f888d1db275c9ae62