Merge "Properly store values to pass to constant state" into sc-v2-dev am:...

Merge "Properly store values to pass to constant state" into sc-v2-dev am: 67c9b400 am: 6298e481

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

Change-Id: I1cce6d66aa8879f62352d633fe19bfba7c2c4e07