[automerger skipped] Merge "Use ParceledListSlice for ZenModeConfig and...

[automerger skipped] Merge "Use ParceledListSlice for ZenModeConfig and AutomaticZenRules" into tm-dev am: f23350d0 am: 2f93dfc2 -s ours am: 0a4b375f -s ours am: 407387e6 -s ours

am skip reason: Merged-In I9925c9bcc542781832d111660e22181151526127 with SHA-1 1c0c39a9 is already in history

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



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