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

Change-Id: I7930551dbe0ad1d17020a60cd0b9f8a81eb41fd2