Merge "Controls UI - Constrain status to increment of stepValue" into rvc-dev am: 08f2fc50 am: 0ffee69e

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

Change-Id: I93bd171737b0d36d3a09cca990772ab385df7ceb