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