Merge "Check the ByteArray actual size before writing it to ByteBuffer." am: b3a3042446 am: f18bfecc7d

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1566234

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7c7c4afc4d3e67358bc4fcee008f398fcb8be22