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

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



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