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: 963280cd am: ddffcf34 am: 39171740

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



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