[automerger skipped] Make Activites touch opaque - DO NOT MERGE am: a418847bb8 am: 9571a17507 -s ours

am skip reason: subject contains skip directive

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

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