[automerger skipped] Merge "Don't throw in socket_read if socket_read_all...

[automerger skipped] Merge "Don't throw in socket_read if socket_read_all returns < 0" into tm-dev am: d2a905d5 -s ours am: 496a28c1 -s ours am: 5315806b -s ours am: eff30a8f -s ours

am skip reason: Merged-In I2a04a799d3748c221f8555fa7afc40d73f0f392c with SHA-1 e6cf914c is already in history

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



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