Merge changes from topic "restricted-networking-mode" am: 176ba02184 am: 3148f011e0 am: 09f21a03a2

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

Change-Id: Ia175efd2e152ea4b04feddf3bdc159adca2edab5