Merge "Don't do any animations for unstyled translucent activities" into...

Merge "Don't do any animations for unstyled translucent activities" into udc-dev am: 2f9daf61 am: d94b4870 am: 6215ad5b am: 30d94ec8

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



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