Merge "Increase meminfo dumpsys timeout" into sc-dev am: b058a60401

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

Change-Id: I195194ef9734a6e5ad3ab4be555e5254887e7cf4