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

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

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



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