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

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

Change-Id: I9efc89e2d0887c7d80e959d33dca18847e8567bc