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: 34580bd9

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



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