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

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



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