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

* commit 'c55a874602183a0e647692a90968b1aba19ea48a':

Change-Id: I631a49a04263e15a46a90a316941280108bd7197