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

[automerger skipped] Make Activites touch opaque - DO NOT MERGE am: a418847b am: 9571a175 -s ours am: 2f9a17d0 -s ours am: f736795e -s ours am: 78d7a5d8 -s ours am: 46fb35d1 -s ours am: be13e482 -s ours

am skip reason: subject contains skip directive

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



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