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