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

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

Change-Id: If3c3ad5ae20030477597fda13455adbd8a32d19b