Merge "Make CentralSurfaces optional" into tm-dev am: db778eee am: e20b1416 am: 2d1d6e30

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



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