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

Bug: 12070265
Change-Id: I293612eba20429dc6ffd7061eba51f24a5f84226
Merge tag 'android-4.4.2_r2' into kk4.4

Android 4.4.2 Release 2