Merge "Fix crash due to missing CentralSurfaces" into tm-qpr-dev am:...

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

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



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