[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 6a53073741 -s ours am: 25ba38c77a -s ours

am skip reason: Merged-In If257e5fa6ad525a57472218ce0f6cba0d5669444 with SHA-1 d3c0e04407 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libprocinfo/+/16844306

Change-Id: Id1c7b276b62508bd626bb208d16d213109d41395