[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 2dbc78ee39 -s ours am: 12d5c16a87 -s ours am: ab53da358e -s ours

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

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

Change-Id: I1808dfcf62cb957821fc86331814f74171b58204
tree: 0f78c8160a535dd7e12e3ba7d55b5ce2d74f12ad
  1. core/
  2. services/
  3. tests/