Merge "ConnectivityService: Grant networkstack uid extra privileges"
am: 9d450f632f

Change-Id: I1bdf4e65fc11a6528818d53e3034c883b2ef8c8b