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

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

Change-Id: I632c527a2db20c7384277ed7018dda72bcd0c262