Merge "Add back in mBufferId to GraphicBuffer ABI." into rvc-dev-plus-aosp am: 764870d336 am: d3f29a6590

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

Change-Id: I6db32035b84a73b1ab3b795553d7b8a0981e8abe