Merge "Merge "Add a flag for the keep clear areas for PiP" into tm-qpr-dev am:...

Merge "Merge "Add a flag for the keep clear areas for PiP" into tm-qpr-dev am: 299b8d88" into tm-qpr-dev-plus-aosp am: c0fd8e78

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



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