Merge "When the origin is empty but not null, app label should be used" into udc-dev am: 0d4cf06b am: 963280cd am: e6c5d007 am: e133cf76

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



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