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: Ifea1511f02dc1a9bba8af1dd7db535c81b199808