Merge "Also put show in the finish transaction when setting up animation" into udc-dev am: 77364c59 am: cf7980a5

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



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