Merge "Fix pointer arithmetic for ByteBuffers with non-zero positions" am: 8020e4addc am: fbb42c3b08

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

Change-Id: I2ced2512b5b6081dc3757eb3fdd3dcb80fb4946f