[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into rvc-dev am: 838fc349b6 am: 47f5ba9a3f -s ours am: f9f8cebc12 -s ours am: 7093cdc41e -s ours am: 267af82f4e -s ours am: 2c71551372 -s ours

am skip reason: subject contains skip directive

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

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