Merge "Fix PiP disappearance after unlock" into tm-qpr-dev am: b8de8adf am: 60bcfcad

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



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