Merge "Remove nested repeatOnLifecycle calls" into udc-qpr-dev am: ed24500c am: 4314cfba

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



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