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

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

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