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

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

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