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

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

Change-Id: I78710dc805bd39f311d3d00f44dc23cb828a61b2