Merge "fix validateBufferDescriptorInfo error when usage bits were 32-bits" am: 61ba79e876 am: a464d0d640 am: 5563143a0c am: f562fc1524

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

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