Merge "Squishy ViewState no longer mutates global album art widgetState" into...

Merge "Squishy ViewState no longer mutates global album art widgetState" into tm-dev am: 4b337846 am: d337273f am: 5c6b4901 am: fa08ed32

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



Change-Id: I61f760ac371d5541e7b6e8b3cf2551db1c981ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>