Simplify SimplifyAlwaysThrows am: a3bd09c50c am: c78035d06c am: b8c0dabf2b

Original change: https://android-review.googlesource.com/c/platform/art/+/2378932

Change-Id: If587a15bfc1fa36c1d23b129ff85d3128ba1061a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>