[automerger skipped] Merge Android R am: 081f91811e -s ours am: 6f98b4c064 -s ours am: 7784c73dfd -s ours am: 1bb6814635 -s ours

am skip reason: Change-Id I349663519ef1c6b0644245e35850b19eb6ce3bab with SHA-1 17c0082ed1 is in history

Original change: https://android-review.googlesource.com/c/platform/system/memory/libmeminfo/+/1421786

Change-Id: Ie3b5081c7e41b6af2e0b1e39b5745df6c2bf27a7