Merge "Use ServiceSpecificException in RecoverableKeyStoreMgr"