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

Change-Id: Ieaf2ede5f76384ff81038a4f95a20ec80b744f88