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

[automerger skipped] Merge redfin/bramble support. am: 9781499a -s ours am: ec2bbed5 -s ours am: 8c42e512 -s ours am: 1238c6d3 -s ours

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

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

Change-Id: I3019ebd910dd1cc0a8dc0e911bdc25d83a439df1