Merge change 21409 into eclair

* changes:
  b/1438315 Fixed back behavior for Calendar.