Merge "Fix componentName of a selected app" into udc-dev am: 3a9a83da am: dd42a85b am: 1eb2a723 am: 67e804f1

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



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