Merge "Remove unnecessary public API getActiveNetworkForUid" into sc-dev