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

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



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