Merge "Revert "Integrate IKeystoreAuthorization aidl's addAuthToken wit..."" am: 5896e8c4fd am: ec5b2c95cd am: 9937680764

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0cdc4f92c34085bd4faad4fce9807dbedaa7bfa