Merge "[TP] Fix carousel scaling" into tm-qpr-dev am: a78e2b6886 am: fa28f68c1f am: c91b775ad2

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

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