Merge "Keystore 2.0: Add onDeviceOffBody to AndroidKeyStoreMaintenance." am: e36f515441

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

Change-Id: I8f32ec1e083dc17d51911d6a493c7a74a32e8cea