Merge "Fix crash due to missing CentralSurfaces" into tm-qpr-dev am: 5917ed11 am: 2880a3c4

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



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