Merge "Revert^2 "Load persist props before starting apexd."" am: 9eeffa42...

Merge "Revert^2 "Load persist props before starting apexd."" am: 9eeffa42 am: b3856494 am: 6fd09c64 am: a8f390dc

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

Change-Id: I581389368620f8d8e08729a71d4da400b7a08f17