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

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

Change-Id: I7a274e4cd4e355b5308aa287870d11e8d9d610d8