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