[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: 7093cdc4 -s ours am: 267af82f -s ours am: 43961267 -s ours am: 91c1871c -s ours

am skip reason: subject contains skip directive

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



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