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

Change-Id: I15ef9c6efd40e8fe9bb9ff6ae98cae556dc0f8fd