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

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

Change-Id: I2b62e59f5c19e580b75e99e0bed03edeeb3195f4