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