Merge "Add APIs to support granting access to Android Keystore keys" into main