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

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

Change-Id: Icb985bba602b2f2a63cd0f29a7a3c12df28b6916