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

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

Change-Id: Ie8034c409dfb4bb25eeca697723849309addbe8d