Merge "Move LocationTimeZoneEvent to com.android"