[automerger skipped] Make Activites touch opaque - DO NOT MERGE am: 73ee4cb9c4 am: cbcfab9bbe -s ours am: 2de6d64027 -s ours am: 83b662a66e -s ours am: 57a2558f3a -s ours am: 28d1127d86 -s ours am: f23c5563a0 -s ours am: 04b928b762 -s ours am: 87829bb870 -s ours

am skip reason: subject contains skip directive

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

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