Merge "Early crash of servicemanager shouldn't start apexd" am: b1fe177d am:...

Merge "Early crash of servicemanager shouldn't start apexd" am: b1fe177d am: 454764ce am: cc7f34be

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2422299



Change-Id: I23dd6d60adbb8eac914d5cedcf9d078a1c4fb548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>