Merge "Constrain scaled amplitude to valid values in [1,255]" into sc-dev am: 81c669d3 am: 4548724b

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

Change-Id: I43e0eae5e58317c3ddac5ae8fbf7dd1d87c3e6f1