Merge "Tweak DelegatedAdminReceiver API surfaces"