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: 2099dd21 am: afefc873

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



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