Merge changes from topic "presubmit-am-e3b24fbb521d41c886ee0c5a75f18fa2" into...

Merge changes from topic "presubmit-am-e3b24fbb521d41c886ee0c5a75f18fa2" into sc-qpr1-dev am: f46c1904 am: 6d976fb4

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

Change-Id: I5b8820b0c3868a0d98b743929ba149020d8d3ee6