Merge "Enforce contigious but unordered buckets" into tm-dev am: ee3ca4bc am: e64f3f8b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18199365



Change-Id: I730ff1f28d73c1ef049ebfcdb67df2b7d6e89373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>