Add cleanup for KeyguardService.wrap()

Test: atest CtsWindowManagerDeviceTestCases:KeyguardTests
Test: atest WMShellUnitTests:ShellTransitionTests
Bug: 282855967
Bug: 282285418
Bug: 282763264
Bug: 266978825
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7c579a19a70bfec88fd6e56ec12ff0c4e56eb656)
Merged-In: I9ff82a59af05375e30d1de1647a423b4e8e1abb7
Change-Id: I9ff82a59af05375e30d1de1647a423b4e8e1abb7