Merge "Skip immediate hiding from finishTransition" into tm-qpr-dev am: d62ad11b am: 298d7c19

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



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