Merge "Do not use hidden broadcast API of RemoteCallbackList"