Merge changes from topic "restricted-networking-mode" am: 1d156cb04e am: 83711b9a0b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505234

Change-Id: I1ae2656e91f1fa6b35ea34177496bd9ad23daceb
tree: 08c6a0f0a174e3b036d41aeeccf218e2a1b69b63
  1. core/
  2. services/
  3. tests/