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

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

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

Change-Id: Ic580d3e1e6a0181acf78f78ad2d8f353b4d7b6b5