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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id945fada1811b805cb442a577975a163a3ff6bd5