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

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

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