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: fa44a645 am: b0fbb485

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



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