[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: f9faae40 -s ours am: 9aa76809 -s ours am: ab774ce2 -s ours am: db3e18e4 -s ours am: af36a9a4 -s ours

am skip reason: subject contains skip directive

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



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