Merge "Apply new settings widget lib for cbr roaming feature support" into sc-mainline-prod am: f10df2a8

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

Change-Id: I6c92fd5778622ac54c1d18dbf21e331b6ed21308