Merge "Increase meminfo dumpsys timeout" am: d40d76a739

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

Change-Id: I4010a2f03412f85a239dc6d912793e3b2c5fa3d9