Merge "Increase meminfo dumpsys timeout" am: d40d76a739 am: 0f0af3a1fd

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

Change-Id: I53d489ab74b0480317231199783fa5c48cea9005