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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e5641bf7b996a717867b204f218022737eb22e0