Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba50c am: 45b4885a90

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

Change-Id: I5c7175f1130a9f0d09c985cbc3b47d4b27912794