am d6f9451b: Merge change I6d696a98 into eclair

Merge commit 'd6f9451be96d013cd640535cfc14dfc1585bb9b3' into eclair-plus-aosp

* commit 'd6f9451be96d013cd640535cfc14dfc1585bb9b3':
  b/2123455 Single tap on an event will always launch the event details.