Merge changes from topic "presubmit-am-445a081c9bbe42778389baf3ca97cdb1" into sc-qpr1-dev am: 159dff15

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

Change-Id: Ia502ab558fa3c982b6589cfc4cf57295f867f6e6