Merge "Add challenge-less resetLockout for new AIDL interfaces" into sc-dev