Merge "Remove SyncCalendarTest am: d4d2fa8925 am: e62f92eb5c" into nyc-mr1-dev-plus-aosp