Merge "Minor bug fixes related to package/dpc removal" into udc-dev am:...

Merge "Minor bug fixes related to package/dpc removal" into udc-dev am: 646ad055 am: 7d6cf6f0 am: 6625aded am: 64b066a8

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



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