[automerger skipped] Make Activites touch opaque - DO NOT MERGE am: 22261fa6...

[automerger skipped] Make Activites touch opaque - DO NOT MERGE am: 22261fa6 am: 9bcdd408 -s ours am: 128595df -s ours am: d144058f -s ours am: c9006002 -s ours

am skip reason: subject contains skip directive

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



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