[automerger skipped] Merge "DO NOT MERGE[Wear] CP wear setting keys in a...

[automerger skipped] Merge "DO NOT MERGE[Wear] CP wear setting keys in a batch." into udc-dev am: ae3c8b79 am: 8fd46811 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22432274



Change-Id: I5f2d122e7d4026aa9d4a46d252a1247c8cb0a0db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>