Merge "Fix Talkback announcing null when changing color option" into sc-v2-dev am: 2d8522dd0e

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

Change-Id: I5cc834c168db9e36a8220a0d4fcc8208f7e99345