[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 7eb675f03d -s ours am: f39a6803e1 -s ours am: 7e3ce21887 -s ours

am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 107ae95001 is in history

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

Change-Id: I63b18c469854d3c3025c7b6e99827ddbea327f65
tree: 84ec0e2f07f422708adcc8f552f6feac748c5f1f
  1. core/
  2. services/
  3. tests/