Merge "Keystore 2.0: Android Protected Confirmation" am: 30841f177c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0d51926f5045c83c12e04ba216f00e7cb287745