[automerger skipped] Remove HardwareAuthToken parameter from clearUserKeyAuth...

[automerger skipped] Remove HardwareAuthToken parameter from clearUserKeyAuth am: d04de5ce am: e4f51c74 am: 6564d713 -s ours am: a776b9a6 -s ours

am skip reason: Merged-In I739b519b0e91293acbf018020891d68b3090c175 with SHA-1 2a8ab477 is already in history

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

Change-Id: I16a950aaaf6fd2116fba4cbce8df3f8722414cca