Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba5 am: 45b4885a am: 0dfb5908

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

Change-Id: I72155419834be77d809a1d9c330818210efee57e