Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba5 am: b841426a am: f5c007e0 am: 8360b3c8

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

Change-Id: I10c65f904c95f1693bd2366b728d359abb6d4717