Merge "Delete CM#testAccessNetworkPreference Test" into gingerbread