Merge "Remove CentralSurfaces from ShadeController" into tm-qpr-dev am: b2356696 am: 2cdce64f

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



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