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: I0f1671093538d0ebad3d72f450f9300a827b471d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>