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

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



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