[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into...

[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into sc-dev am: 8d0b023f am: be5aef03 -s ours

am skip reason: subject contains skip directive

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



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