Merge "Ignore too-early earlyBootEnded on FDE devices" am: a3bd31c170 am: 979429e6c3 am: 9f749bcb19

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1747633

Change-Id: I9b3df8ebb2a678fc5c865146f66014343c5a0515