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

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

Change-Id: I44271dea26e82557ebd018b8eb1dae9aca041ca7