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

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



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