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

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

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