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: 9e35e8a3 am: f592c9e0

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

Change-Id: Id7024fc3d792771fb306f3b562b839328ee15d8f