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

Merge "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev am: afc9fd27 am: 0e123f2d

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



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