Merge "Make Activites touch opaque - DO NOT MERGE" into sc-dev am: 8d0b023f

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



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