Merge "Fix broken RestrictedLockUtils KeyGuard APIs"