Merge changes from topic "EventInfoFragment" am: bf857d93f1 am: 919c7ffa6a

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

Change-Id: Ie765a8ee68aa6017f72497cd11ba17fc5516c13f