Merge "Start tombstoned early in post-fs-data." am: 77dfd99beb am: 8819b90d32 am: adbd10013a

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

Change-Id: I32c84dbc1d1d5e3841c89593656efcac12367f68