Fix Positioning of large custom clocks within frame

This reverts Iaeddce2d99a2b8db5afb6ac8ca508eeab3ae223e without
reintroducing b/259758161. It does this by compensating for the
change in margin in KeyguardClockSwitchController.getClockBottom().
This maintains existing functionality for the aod behaviour in
KeyguardClockPositionAlgorithm. As part of validation I confirmed
that the arguments to KeyguardClockPositionAlgorithm.setup did not
change with this patch.

Bug: 259758161
Fixes: 261754025
Test: Manually checked KeyguardClockPositionAlgorithm
Change-Id: I119abb49a018f6fb505100ea985d3b4121ac59f7
4 files changed