Merge "Add labels to intensity slider and flip labels" into sc-dev am: afd77763b9 am: 9cb975e4c4

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

Change-Id: Idbca001ba3925b318615224cdba362f55c9dba57