[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: b25ca32d -s ours am: cead4f64 -s ours am: 79a71722 -s ours am: 7d6d818b -s ours am: 80bbc078 -s ours

am skip reason: subject contains skip directive

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



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