Merge "Don't hard-code number of tombstones." am: a4807cba22 am: d5076451dd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I011d4671f394eba111992731008575bed45e7252