Merge "Remove use of UserHandle in LocationTimeZoneEvent"