[automerger skipped] Merge "[CS] Add an option to block sensitive network...

[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e -s ours am: 634c26d6 -s ours am: fe846d30 -s ours am: 107c868f -s ours am: 16b8f33c -s ours am: 4df28b66 -s ours am: 7af86edd -s ours

am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 836ad571 is in history

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

Change-Id: If707689b95c540cf6b25357f6e6a9284cca3971c