Merge "Fix componentName of a selected app" into udc-dev am: 3a9a83da am: fadb1e96

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



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