Merge "Disable ChangedThrows" am: 65ef5b4d8c am: 2c146ef569

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1988627

Change-Id: I69fea1b273878f18cb6a8c994912bd2b97861619