Merge "Make sure PiP appears on screen when folding the device" into...

Merge "Make sure PiP appears on screen when folding the device" into tm-qpr-dev am: a490e750 am: cb7a5f07 am: d82a33a4

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



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