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

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

Change-Id: I00f41ab6b0ad376cc52fde535070c3d0ba4480ed