[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into...

[automerger skipped] Merge "Make Activites touch opaque - DO NOT MERGE" into sc-v2-dev am: 3c475749 -s ours am: 612a45c4 -s ours am: b433c651 -s ours am: 49726d24 -s ours

am skip reason: subject contains skip directive

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



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