tombstoned: add tests for b/36685795.
am: dd61876771

Change-Id: I4069a56cf1ffe7932bdbdd69ef0be65ba741b76c