Merge "Removed @Deprecated SystemService callback methods that take a userId."