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

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

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