Merge "Fades in preview of feathers to avoid flicker" into tm-qpr-dev am: 33245ad361 am: d9161f331c

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

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