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

Change-Id: I9b2faf60ff007e2cc08dacd6988fe98377468e7e