Merge "Apply syncPipSurfaceState synchronously" into udc-dev am: cc112e1010 am: 5014fea591 am: de717dcb14

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

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