[automerger skipped] Merge "Added utils for migrating blocking zone configs to...

[automerger skipped] Merge "Added utils for migrating blocking zone configs to DDC" into tm-qpr-dev am: 646ab46e am: ba85d2a2 -s ours

am skip reason: Merged-In I27b3865fb4c4ea455fcf3594c3b778a8e592f949 with SHA-1 23eea48e is already in history

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



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