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

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

Change-Id: I285383ddeb95304f17649c17dfcb2b3ac6090275