tree 8e25f43f1f107b77f8037f4dfc8d5ba10dd290a1
parent 5411289db2d5a642491106111beb6b96e598e784
parent e36f5154411f779c917ca105ba2503d56508881e
author Janis Danisevskis <jdanis@google.com> 1616611168 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616611168 +0000

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