Merge "Do the same size-configuration bucketing on both server and client"...

Merge "Do the same size-configuration bucketing on both server and client" into sc-dev am: 1b529aa1 am: 714e4e9c

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

Change-Id: Ic84e7150a095e6e53ab2a06e35fc92d9e53d0478