Merge "Fix scale for translucent activities" into tm-qpr-dev am: 5f267c36...

Merge "Fix scale for translucent activities" into tm-qpr-dev am: 5f267c36 am: 0c1865bb am: 7f19c392

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



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