Merge "Merge "Allows IndicatorView to have a different size than Settings...

Merge "Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b6 am: eab29335 am: 29e6eb05" into rvc-qpr-dev-plus-aosp am: fb2e613c

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

Change-Id: Iae58dca98cd8f24f4bd2507cd7b267f11257fdff