Merge "Support backward compatibility for restricted network permission" am: dffb7d98 am: 8fc1f685 am: fe32d95a Change-Id: Icdf485f714e05fa8500ea785230444fbeac98cc5