Merge "Fixed issue with invalid stretch params" into sc-dev am: 93ea53bbe2

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

Change-Id: I1bd1c4e41c582ab7e7df09aad853e6d710b5208a