am 31f472ca: am 9b168fae: b/2167301 Guests were dropped when creating an exception to a recurring event.

Merge commit '31f472caed0618ab2d15aa7b493fada2c0abf846' into eclair-mr2-plus-aosp

* commit '31f472caed0618ab2d15aa7b493fada2c0abf846':