Merge "Skip immediate hiding from finishTransition" into tm-qpr-dev am: d62ad11b80

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

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