Merge "Fix shade over occluded activity" into tm-qpr-dev am: b5285791 am: 77792e37

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



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