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

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



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