Merge "Defer finish() to onStop() when doing shared transition" into udc-qpr-dev am: 96275184ae

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

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