am 9dbaf3ea: (-s ours) Merge change I80332800 into eclair

Merge commit '9dbaf3eaf067cce1adcdd942c3ac6cad4d4eb380' into eclair-mr2

* commit '9dbaf3eaf067cce1adcdd942c3ac6cad4d4eb380':
  Temporarily disable flaky test CalendarProviderTest#testInstanceRange DO NOT MERGE