Merge changes from topic "presubmit-am-e3b24fbb521d41c886ee0c5a75f18fa2" into sc-qpr1-dev am: f46c1904f2

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

Change-Id: I096d4a40bb91d0f0e863a476495117d8d64cce04