Merge "Remove NETWORK_SET_TIMEZONE broadcast" am: 1bfb17e370 am: f50abb1ce5 am: 026efc3bb7

Change-Id: I363b596452316574fe748fb6b087246784f36a35