Merge changes from topic "presubmit-am-7cdc57ecaf194d2d990a0d381cd9d593" into sc-qpr1-dev am: affece88 am: a3d0cec6

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

Change-Id: I0e1276eacf1d3d09aa4f6afbc7954265c31fab92