Merge "Revert "Deprecate setRemoteAdapter that takes service intent"" into main