[automerger skipped] Rename CentralSurfacesInt back to CentralSurfaces. am: d2e10c93 -s ours

am skip reason: Merged-In If4152279970090eeb3ea34307dfade5873e9dbf3 with SHA-1 ce791846 is already in history

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



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