Merge "When the origin is empty but not null, app label should be used" into udc-dev am: 0d4cf06b am: d43f7696 am: 156700c2 am: da80582f

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



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