Merge "include unit test for enhanced error handling" into rvc-dev am: 42472cb3 am: 117ed1b6 am: 5eb0532c

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

Change-Id: I02d8c66a74006187f214c42dddea37cba928dac0