Merge "Early crash of servicemanager shouldn't start apexd" am: b1fe177da3 am: 454764ce64

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

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