[automerger skipped] Merge "Increase meminfo dumpsys timeout" into sc-dev am:...

[automerger skipped] Merge "Increase meminfo dumpsys timeout" into sc-dev am: b058a604 am: c5d657fc -s ours

am skip reason: Merged-In Ic270a81f3dde1329881023d533ffbff43a82127c with SHA-1 fac7e2b5 is already in history

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

Change-Id: Idc28e2b3bb5b9a85c13a07e556184764c23ff2d9