tree ba65c8fe74294f54c6117a1dbee4af3fcf81ca75
parent 3606076fe191bba445b8323d46970fec55716a86
parent 0a57ff459d105e7f73b88eeab9a54c1d5bb23434
author Sudheer Shanka <sudheersai@google.com> 1616092050 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616092050 +0000

[automerger skipped] Merge "Add an API to listen for changes in network blocked status of an uid." am: c262455617 am: 5580953ba4 am: 0a57ff459d -s ours

am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 cb5fd4a670 is already in history

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

Change-Id: Ib66aa700dadfb0f61dec05429ace186f87040ad7