Merge "Track removal of NETWORK_SET_TIMEZONE intent"