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

Change-Id: I15ef9c6efd40e8fe9bb9ff6ae98cae556dc0f8fd
tree: 8616070cc533ee2f299a0ad7027f3776f3e69a45
  1. core/
  2. services/
  3. tests/