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

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



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