Merge "Pass the keep clear areas through proper implementation. The PipController is not registered as DisplayWindowListener, but this inner implementation is." into tm-dev am: 34fd7c52 am: f472b792

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

Change-Id: I8af4f3f138c77a80522915802be09ede6b966367