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

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

Change-Id: I04ba3b2ad54cd220cf05d7460ef90d9cf11b426d