Merge "Update deapexer call to explictly use blkid" into tm-mainline-prod am: a43b4c49

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20454260



Change-Id: I78fbd4eeab23ad8e2230c184ef0bbf4f5127153a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>