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

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

Change-Id: I6eb970e2642248dbe4c4196cb92652f356bfdd3e