[automerger skipped] Make Activites touch opaque - DO NOT MERGE am: 74ce78dfb4 am: 61dbe88cf9 -s ours am: 4a9d4427db -s ours am: c92526162f -s ours am: 86cb3ec237 -s ours

am skip reason: subject contains skip directive

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

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