[automerger skipped] Merge "Cleaning up flag...

[automerger skipped] Merge "Cleaning up flag NETWORK_BLOCKED_FOR_TOP_SLEEPING_AND_ABOVE" into main am: 7a43fd10 am: c18aeb88 -s ours

am skip reason: Merged-In Ibe8b4226368b6ce17b8c1c084129924844391372 with SHA-1 1d534ee4 is already in history

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



Change-Id: Ia362f8b470d177d384663f5178d1a45a20d57588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>