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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c3dc1d497c38ef6f9de7b66e533ad5378bd1f99