Merge "ConnectivityService: Grant networkstack uid extra privileges" am: 04665dbfcc
am: 24487ef5a6

Change-Id: Ib5437cb8eece577e91ed7d65f1f22170f0c88204