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

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

Change-Id: Iaf266da5d20eacd27a88b8801fb377bacecb0fb6