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

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

Change-Id: I4b1bab6a7208a36a8efcb4144099591d7cf85761