9ac6f42610
Also, add more unit tests around Widgets.
This reverts commit d9ed5f301b.
Test: Added unit tests
Flag: N/A
Bug: 330906931
Bug: 294386159
Change-Id: I8de74bce8bddd06e5ce1399d26253cb936281bee