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

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

Change-Id: Ifd9ce364e8117b1f4be7cdfd569b0fb34e7bb87b