Merge "[IncrementalService] use sysfs_name in mount options and dumpsys" into sc-dev am: 7a76d7f7 am: f2eb924b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14329141

Change-Id: Ia51836d83c8b3ea6a08ad3ab84e83c1a68bcb989