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

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

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