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

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

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