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

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

Change-Id: I688155b070ae9db80da0575f48a0a4826d9725d2