Merge "Split fsverity_init in two phases." am: cd91f86618 am: b7ab0c71a1 am: 5152e1f862

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

Change-Id: Id01798e8c9c2aea01dce532e2d1f2b22cec92d61