Merge "Apply default policy for enabled rules without custom policy" into...

Merge "Apply default policy for enabled rules without custom policy" into udc-qpr-dev am: 8feb1df2 am: 23a0578d

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



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