[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 17c0082ed1 -s ours

am skip reason: Change-Id I936f79eeb10a855313078492294a975414dc4b9c with SHA-1 5c30067a8b is in history

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

Change-Id: I305478d17ea7fda00f3ae9a996703feb618c0497