Merge "Fix pip surface properties during keyguard exit" into udc-dev am:...

Merge "Fix pip surface properties during keyguard exit" into udc-dev am: 75faf083 am: d0137ee9 am: 04a60e5b

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



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