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

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

Change-Id: Idd522a3a1242863648f44655c2781c6e514cf741