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

Change-Id: Iedaa35ed0c77d20d42db6717f70e41950ad86e09