Merge changes from topic "EventInfoFragment" am: bf857d93f1

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1760908

Change-Id: I924f6504f7faf441f5f744c303a51e878df1c54b