Merge "Properly catch exceptions" am: 3740fa075d

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

Change-Id: Ic933844d0922681147a1352d5c5ae37972478360