Merge "Better error message for unexpected exceptions." into tm-dev am: 645d078e am: 00325a9c

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

Change-Id: I11c81b2c6491e98d9f1f6ae073a77c837f1dcd38