HardwareBuffer API cleanups am: 8d49e953eb am: 84d92f6df8

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

Change-Id: Ifb8d45880065605d662cdc2c1799db3678b660e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>