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

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

Change-Id: I61ac11bb4a9e36e60ca1268fea86be65e7b165f7