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

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

Change-Id: Ia400ac7117bef190aef6538a01666142c5157b67