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

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

Change-Id: I8804b3b51898c334a4c5d40db8e360d384b6710b