Merge "Make fragment the owner of the view model" into udc-dev am: 74708e17

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



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