Merge "Merge "Change the id for color sections and its ancestor." into tm-dev...

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 am: 6b533e07

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



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