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 am: 118dcb1f

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



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