Merge "Support backward compatibility for restricted network permission" am: 3e8de1cade
am: 5d443532b6

Change-Id: I9b2faf60ff007e2cc08dacd6988fe98377468e7e
tree: 732b10e275e0b16f2a3a21df947ffbbdafdfff9e
  1. core/
  2. services/
  3. tests/