Merge "Keystore 2.0: Fix TODOs in public doc comments." am: 12ddcc8874

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7690d600faa4677b4565107c060958eb882be23