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

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

Change-Id: I3d86c186b3db43b11095f424db3486ee88d19f72