[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into...

[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into sc-v2-dev am: 3c475749 -s ours am: 612a45c4 -s ours am: 5c919857 -s ours am: 093fbfd7 -s ours am: bdde6276 -s ours

am skip reason: subject contains skip directive

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



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