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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1d8eb0ded203513f1f631f45632b02a8055f923