Merge "Verify that section buckets and header controllers are contiguous" into...

Merge "Verify that section buckets and header controllers are contiguous" into tm-dev am: 04248bdd am: f61b6a65

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

Change-Id: Ia82889e78d8fccd6cf7b80e00f9c680f8adfd1e4