Merge "Add LocationTimeZoneProvider test infrastructure"