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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id576656c9bc9c3434b9feca7320e04fc2d500b13