Merge changes from topic "presubmit-am-7cdc57ecaf194d2d990a0d381cd9d593" into sc-qpr1-dev am: affece888e am: a3d0cec6d6 am: b8c8c23a94

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

Change-Id: I964e38a66f34d3825039c399933bd2e36d7a7bad