Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a am: eab293354a am: 4d896e3da8 am: 296b9dcbe3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166

Change-Id: Ia1e671d00528170aad8b960ed3704fb25e407900