Merge "Fix dumpsys meminfo is not completing in bugreports" am: 90e39e440f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9c359f9ba58d12b91c478372c5231a25cdaae67