Merge "Apply new settings widget lib for the cbr main feature switch" into sc-dev am: 5e20541f

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

Change-Id: Idacf5283139bd5c94115d649f63fc551d2595f61