Merge "Log manual rules in the zen rule snapshot dump." into udc-dev am: d386f82b

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



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