Merge "include unit test for enhanced error handling" into rvc-dev am:...

Merge "include unit test for enhanced error handling" into rvc-dev am: 42472cb3 am: 448ba813 am: 9817a0df am: d137df26

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

Change-Id: I08bc5a9a083c1ee911d90344a18f3c3df749e3c8