Merge changes from topic "dispatcher-policy-cleanup" into udc-dev am: c5d9123906 am: 048d057e89

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

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