[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 skip reason: subject contains skip directive

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



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