Cleanup for Bottom action bar am: 90b4522248 am: 94fb39f528

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

Change-Id: I4c517dbb0c17a3fcb1616141743eb62a89ae5e8d