Merge "Change groups to use number in the expander." into sc-dev am: 82336d75 am: 4b7ca0cf

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

Change-Id: Ib49edfbee811e161ee67b0d5485d975ff355fbf8