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

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



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