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

[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into rvc-dev am: 838fc349 am: 47f5ba9a -s ours am: f9f8cebc -s ours am: 68eacf71 -s ours am: fcdeff82 -s ours am: cc408745 -s ours am: e1c30ade -s ours am: 954306c0 -s ours

am skip reason: subject contains skip directive

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



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