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

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

Change-Id: I674ad0ee61b682576a5bd0a84620e78eb10b5906