tree 9be047cccde6728be1de0a7dc44c7e8db1403a3e
parent 01b521197afa308887490fdb26c85c3231dfc3c3
parent 107c868f109199f005a7984d43aa1df0cf72debe
author TreeHugger Robot <treehugger-gerrit@google.com> 1599702250 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599702250 +0000

[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 634c26d63f -s ours am: fe846d3095 -s ours am: 107c868f10 -s ours

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

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

Change-Id: I63b18c469854d3c3025c7b6e99827ddbea327f65