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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I152776851eaed8754e4ea6033d5606da99e4ae1a