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: 56375b70 am: a9c3f089 am: 8d6e03df

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



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