tree 42f81ce85bf532400750b0117210e8b0f18f876b
parent 66978d1090a1aff4e9bb9023c90422bcad9c53ac
parent 5fda0bd0af18ecf3b89349ac7d715015fbe9c3b1
author Patrick Rohr <prohr@google.com> 1606999184 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606999184 +0000

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

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

Change-Id: Ia175efd2e152ea4b04feddf3bdc159adca2edab5