Merge "Fix WidgetsSearchBarControllerTest" into sc-dev am: 2c880a321d am: e8e3df30d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14639868

Change-Id: I99941b6229e04ba1ea54990d72dd7261ba54480d