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

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



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