Merge "Defer creation of input sink surface until sync completes" into tm-qpr-dev am: 6d4dc228

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



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