[automerger skipped] Merge redfin/bramble support. am: 9781499af8 -s ours am: ec2bbed55d -s ours

am skip reason: Change-Id I2a7aa5f17b334545f79a4552be9f8df2f91f7b82 with SHA-1 c07254e6aa is in history

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

Change-Id: I62159f09498cd1cc815a88d5e13917f909e2b935