Merge "Add fs_type to lpdump" am: 3750abf737 am: e13919a727 am: b44b711751

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2528967

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