tree 517e23ebad4264ac36109c6036d5f8892611d62a
parent a4903ada1e5d1d752b6fceb0ecd58e0313ba9092
parent 6f9bce51aa0a25b5ba2d350b168f811f0caa3515
author Paul Hu <paulhu@google.com> 1596453511 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596453511 +0000

Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: 2933a04749 am: 6f9bce51aa

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

Change-Id: Id91c6de75e524080d15e2508007d5de997c7fd92