Merge "Merge "Revert "Move PiP when it occludes a keep clear area with naive...

Merge "Merge "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev am: afc9fd27 am: dd746519" into tm-d1-dev-plus-aosp am: fce8ecb2 am: 34edc225

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



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