Properly catch exceptions am: f2a95df22a

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

Change-Id: I17c67dc12d45f97c6dbf1da483d5c7b4fa6ce6e9