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

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



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