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 am: 085c037c am: 64921c11

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



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