Merge "Temporary fix DialogLaunchAnimatorTest#testShowDialogFromView" into sc-v2-dev am: d7b0a36294 am: c35d7beb06

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

Change-Id: I71a82cc6270408c2774d32355e0365a0fc3f74d7