Merge "Remove obsolete TODO from IKeystoreAuthorization.aidl" into main