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: I218a9e3530167c68b05cdb68edb66b9d41952cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>