[automerger skipped] DO NOT MERGE[Wear] CP wear setting keys in a batch. am: e4457a190d am: a268b4b093 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22432274 Change-Id: Icfe2a2c239eb56212be776dda095bc5391c1cce2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: