[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into sc-dev am: 8d0b023f20 am: f9faae408a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029563 Change-Id: I3eda4d064a9dfc5e8f84969185fc1fa8dd89f152 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: