Merge "Simplify ChooserActivityLogger." into tm-qpr-dev am: ba30238e98

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/20259470

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