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

[automerger skipped] Merge "Merge "Add traces around updateZenModeConfig" into udc-dev am: 3ce065cc am: c27a6fd6" into udc-d1-dev-plus-aosp am: bacc48c8 -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: I3ea6eb4b6d86b0a61ca9c3e8e112287a37a28342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>