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

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

Change-Id: Ic161dd845219ec0e8023e0feb0e414b537751d23