Merge "Revert "Adjusting button container for set wallpaper"" into udc-dev am: 31fb1e7fd7

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

Change-Id: Icf5f0db7d218b6c8ecc2260ac8227f58dbf609fb
Signed-off-by: Automerger Merge Worker <[email protected]>