Merge "Remove keyguard state callback onViewDetached." into sc-dev am: d232ab98b3

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

Change-Id: I963a832b198787c1a2997e86771168cae7a03f46