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

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

Change-Id: I0ac632a7b7ef4197b7d39f69b49580394e1f6784