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: 2eafa92e am: 0ed38016 am: 1d3f5000

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



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