Merge "Remove broadcast of NETWORK_SET_TIMEZONE intent"
am: 78b90b3a76

Change-Id: I699db3f2a3aaef1e319e1eb0ca52d22a07177cc6