Merge "Tabbed navigation in Wallpaper Picker (2/3)." into tm-qpr-dev am: 2c332f8704

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

Change-Id: I6ed8da418ba3c80767dcb521940f32cf3e383e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>