[automerger skipped] Merge "libdm: Make ExtractBlockDeviceName() return its...

[automerger skipped] Merge "libdm: Make ExtractBlockDeviceName() return its result" into sc-dev am: 232ec664 am: 10e14c95 -s ours am: 2b4dae5d -s ours

am skip reason: Merged-In I6363781163eba08e6128507b403200f472f68a59 with SHA-1 6b296db8 is already in history

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

Change-Id: Ib8e596453182194856128950f2ca44e47a24b734