[automerger skipped] Make Activites touch opaque - DO NOT MERGE am: 73ee4cb9c4 am: cbcfab9bbe -s ours am: 2de6d64027 -s ours

am skip reason: subject contains skip directive

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

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