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

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

Change-Id: Iaabbf06f7d92af73397b13ac277f9729588ab861