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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad78430492ee0838456796df741aa2ac81e12692