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

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



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