tree fc3f5d3ed4bd991d624806feae78c2dfb6ca11f1
parent f42a43927406c8aef61a587f497571d20406bc2b
parent fe78ceab3694c969ef3ff484176fc0dc7f89dc80
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: 0549ca0217 am: fe78ceab36

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

Change-Id: Iab86e5ecf719ddec0030b343dca9c2586a2cb8ef