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

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



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