Merge "Remove NETWORK_SET_TIMEZONE broadcast"
am: 1bfb17e370

Change-Id: I2c87960f6c636ebd8b65a3525f87788af09364c2