Merge "Properly catch exceptions" am: 3740fa075d am: 564698b620 am: e21cfa7521 am: 6a2ab5cf9a

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

Change-Id: I99dbabe672a5fc457a4a19f2dfab25b76e632199