Merge "Fixing failing tests in libmeminfo/libdmabufinfo" am: 61984b9a06

Original change: https://android-review.googlesource.com/c/platform/system/memory/libmeminfo/+/2366591

Change-Id: I4a15a1f147557a07643bf47ce19133f2809fb23f
Signed-off-by: Automerger Merge Worker <[email protected]>