[automerger skipped] Merge "Remove HardwareAuthToken parameters from binder interface" am: e7dbc48584 am: d469281f35 am: fd3bca3778 -s ours

am skip reason: Merged-In I6160d30deb138a5366532de84cbf6f02cbc69b8c with SHA-1 5bb9faab49 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021638

Change-Id: I8bf0c2b8fec07db587b29102cb5acacbcd9cb055