Merge "add offset to calculate buffer size" am: de8ca7332b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ed83506f053583b0135c626344daed945f44d15