Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4 am: c3b195a8 am: 12d3fa32

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

Change-Id: Ie93020c2f466b88ca524af684f3e89ccb37f2308