Merge changes from topic "sys_rootdisk" am: 4c7dc7bd1d

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2008276

Change-Id: I6102359bbf9d3b6f7948fa9d146c64a94e83f995