Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev
am: 54a6394c
* commit '54a6394c':
Accept the calendar name in addition to the owner as a calendar filter.
Change-Id: Id788bb4465b947d6b5515a3c1d560c337ea5c382