Merge "[automerger skipped] Merge "Don't throw in socket_read if socket_read_all returns < 0" into tm-dev am: d2a905d5 am: cb9d40ef am: 7bb23816 -s ours" into tm-qpr-dev-plus-aosp am: 2dfe211a -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: Ibc1412834458f6c5ce3235a3d90e76fdf3df2476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>