Merge "Remove noop try catch statements" am: 401c6d5d23

Original change: https://android-review.googlesource.com/c/platform/development/+/1815095

Change-Id: I6c5c988fb833d75cf03359267db6bbce049319fa