Merge "Properly catch exceptions" am: 3740fa075d am: 564698b620

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

Change-Id: I1b76d21f5bde3d25fb9eeb24d21d9207250a859d