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: dd746519

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



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