[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: 29958687 -s ours

am skip reason: subject contains skip directive

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



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