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

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

Change-Id: Ib8e29cdd6b36eff26b7fd1ff1e90a65576ec6fad