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

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

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