[automerger skipped] Make Activites touch opaque - DO NOT MERGE am: 22261fa6 am: eaf6143e -s ours am: 5f1dbe79 -s ours am: c087c9a5 -s ours am: 0427f027 -s ours am: 891c87b0 -s ours am: 4eed13c6 -s ours

am skip reason: subject contains skip directive

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



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