Merge "Move/rename OnReceiveContentListener.Payload to android.view.ContentInfo"