Merge "When the origin is empty but not null, app label should be used" into...

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

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



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