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

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



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