Merge "Merge "Change the id for color sections and its ancestor." into tm-dev am: 3e0e2415 am: b5015c8e" into tm-d1-dev-plus-aosp am: 94a50c12

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



Change-Id: I234919816b7f19f7b6a6f2a6d57720ca0bc42069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>