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

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



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