tree a74dc31889fb8887f05f1e976fba5ad7b1cdf337
parent 053dfc191db95957ab6921ceeaecc5af5a8e9ce9
parent d782bc08d0cd4d0cc9bf8e3cee96aa0b1de82798
author Lorenzo Colitti <lorenzo@google.com> 1619062064 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619062064 +0000

Merge "Hide NetworkPolicyManager.blockedReasonsToString API." am: 82efa81cd7 am: d782bc08d0

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

Change-Id: Iab86e5ecf719ddec0030b343dca9c2586a2cb8ef