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

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



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