Merge "[automerger skipped] Merge "Add traces around updateZenModeConfig" into...

Merge "[automerger skipped] Merge "Add traces around updateZenModeConfig" into udc-dev am: 3ce065cc am: 24510d3f -s ours" into udc-d1-dev-plus-aosp am: 67e753ff -s ours

am skip reason: Merged-In I77a662d17237246d8c9f2c06b38b5bfa64d5c69d with SHA-1 2b0f6886 is already in history

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



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