Merge change I161a5026 into eclair

* changes:
  b/2157070 Fixed the Calendar event reminder alert.