[automerger skipped] Remove HardwareAuthToken parameter from addUserKeyAuth am: 5eb06599 am: 2e4db6c4 am: 67fb478f -s ours

am skip reason: Merged-In I06e7c36787cc7f384acb7742737c3b1cfa50f0ae with SHA-1 6b220a95 is already in history

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

Change-Id: I63ee0338c52719efaa244ca11dce4a5622a431e8