Merge "Revert "Check remaining bytes before attempting to read from buffer""...

Merge "Revert "Check remaining bytes before attempting to read from buffer"" into main am: 03b57b0f

Original change: https://android-review.googlesource.com/c/platform/build/+/3343165



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