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

[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into sc-dev am: 8d0b023f am: be5aef03 -s ours am: 3c8562a7 -s ours am: 4a5df0c0 -s ours am: dbe17b14 -s ours am: 116b63f9 -s ours am: de92b003 -s ours

am skip reason: subject contains skip directive

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



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