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

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

Change-Id: If5cf8d3e8ac5d9dff3914e9007846b63f07e80ea