Merge "Converting padding container to framelayout" into udc-dev am: 4e775876ab

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

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