Merge "Fix NPE before CentralSurfaces is registered" into tm-qpr-dev am: eaa63dbd am: 3ac25089

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



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