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: Iecac72a7cc764a99bc70a0566045069340847681