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

[automerger skipped] Merge "libdm: Export ExtractBlockDeviceName()" into sc-dev am: de0cc6cc -s ours am: 49480a48 -s ours am: 03961ecc -s ours am: 102d7b60 -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: I84d1a1138b9e3a7f04851ea74ccbe1e7a6f53d13