Merge "Making activity invisible when occluded by one of the adjacent TF" into sc-v2-dev am: e6a32faf86

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

Change-Id: I883002ac8ea10c07cc5a0c437910a7935527a2f9