[automerger skipped] Remove HardwareAuthToken parameter from addUserKeyAuth am: 5eb0659999 am: 2e4db6c49e am: 67fb478f37 -s ours am: 455f94f8f7 -s ours
am skip reason: Merged-In I06e7c36787cc7f384acb7742737c3b1cfa50f0ae with SHA-1 6b220a95e9 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021758
Change-Id: I273db1113bcd7ee8b15d08ddd8e23294fd85222e
This commit is contained in: