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

Merge "Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4 am: 4e68b98b" into rvc-d1-dev-plus-aosp am: 1940c40e am: e734d966

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

Change-Id: Id7eeabf5bffc37826fbbfacf4b829514ed458fce