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

Change-Id: I3504e03f00ba46199cab6eaead39ab9d42ea3aa5