Merge "Apply syncPipSurfaceState synchronously" into udc-dev am: cc112e10 am: b2d50afc

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



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