Merge "Removed userId from ContentCapture binder calls."