Merge "Keystore 2.0: Revisite Authorization.java" am: 08bf2e8f49 am: fe60537082

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06162f5c78a30af9f7c7dd8ca2d101417f5b4f24