Merge "Apply new settings widget lib for the cbr main feature switch" into...

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

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

Change-Id: I4051bd7faeda19b616a24c21126d4b2ab1ac3436