Merge "Split fsverity_init in two phases." am: cd91f86618

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

Change-Id: I6a5d18d3023de35754f33097b4e3373d06ffa3ef