[automerger skipped] Merge "add offset to calculate buffer size" am:...

[automerger skipped] Merge "add offset to calculate buffer size" am: de8ca733 am: e8efe9e7 am: 4b95c59d -s ours

am skip reason: Change-Id I6890b02c0f5a5732f1302348d7bff773dac1401f with SHA-1 c908b42a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96490d0c3fc9b8e0201a3a8cf7d8fd0ca361b6e9