Merge 'goog/ics-ub-calendar-fuchsia' into klp-dev

Bug: 12070265
Change-Id: I293612eba20429dc6ffd7061eba51f24a5f84226
Merge remote-tracking branch 'aosp/kitkat-mr1.1-release' into HEAD