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

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



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