am 4f04f9f3: Merge "b/5309787 support allowedAvailability in calendar app" into ics-mr1

* commit '4f04f9f3bee90bad4f0fa0505a5c3644834c1b50':
  b/5309787 support allowedAvailability in calendar app