Merge "Update bufferOffset logic in GPU upload functions" am: 58593e6b12 am: e4a7a6a1f0

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1360890

Change-Id: I4293bbf214b06ec00f1611c340dcadb556632c01