[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 8f27830d2d
am: 8ef613866d -s ours
am skip reason: subject contains skip directive
Change-Id: I3f207781147ba18feaf27c7063b7762f6c7873c7
This commit is contained in: