Merge "Support backward compatibility for restricted network permission" am: dffb7d988c am: 8fc1f68512
am: fe32d95a33

Change-Id: Icdf485f714e05fa8500ea785230444fbeac98cc5