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

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

Change-Id: I74f64f4b7bea5be54d60220c8911088490f618ed