Merge "Merge ConsumeAllLocked into ConsumeAll" into main am: a17967c1e5 am: 30a05afbd7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3271853

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