Device always wakes up when the bouncer shows

Else, we can end up stuck on the bouncer in AoD.

Also, remove unnecessay injections into CentralSurfacesImpl.

Fixes: 223747700
Test: Enroll udfps & aod, lock down device, wait
for AOD, longpress lock icon, then repeat, should
never get stuck on the bouncer
Test: atest SystemUITests
Merged-In: Ib79f54a9c25adeaabdf90039bc04a3dea0ad26a2

Change-Id: Ib79f54a9c25adeaabdf90039bc04a3dea0ad26a2