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

[automerger skipped] Make Activites touch opaque - DO NOT MERGE am: 22261fa6 am: eaf6143e -s ours am: 5f1dbe79 -s ours

am skip reason: subject contains skip directive

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



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