Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4e4

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

Change-Id: Ia349d51a176b04be64a3fcdca6e6155385ca2fe3