[automerger skipped] Make Activites touch opaque - DO NOT MERGE am: 74ce78df...

[automerger skipped] Make Activites touch opaque - DO NOT MERGE am: 74ce78df am: 61dbe88c -s ours am: 4a9d4427 -s ours am: c9252616 -s ours am: 86cb3ec2 -s ours am: edd73d27 -s ours am: d90514fa -s ours am: e5871186 -s ours am: 0a67aa19 -s ours

am skip reason: subject contains skip directive

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



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