[automerger skipped] Merge "libdm: Export ExtractBlockDeviceName()" into...

[automerger skipped] Merge "libdm: Export ExtractBlockDeviceName()" into sc-dev am: de0cc6cc am: b155a9a8 -s ours am: 2fe4da89 -s ours

am skip reason: Merged-In I3e3560f3cdef8978eac644d5b53cf3851209c0c2 with SHA-1 c24f7b82 is already in history

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

Change-Id: I4a2b06794406791d6f9351703b2e291773424b7b