Create an interface that encapsulates the common arguments to AddUserAuthArgs, add that interface to KeyProtection and KeyGenParameterSpec, and refactor AddUserAuthArgs to accept an instance of that interface. Test: CTS Module CtsKeystoreTestCases Bug: 74017618 Change-Id: I591e34e5d08421ea1c022bbb6e955ee3c01eb435