Merge "Forward fix/revert of clock detached state on keyguard visibility" into...

Merge "Forward fix/revert of clock detached state on keyguard visibility" into sc-dev am: f369b89e am: 55f18554 am: 18eeeee9

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

Change-Id: Ia67ccd964051c0fb016fda43a655605368367c11