Merge "Remove unnecessary SystemApi annotation from EasyConnectCallbackProxy"