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

Merge "Enforce contigious but unordered buckets" into tm-dev am: ee3ca4bc am: 07f2006b am: 7d54acd7

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



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