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: 117ed1b6 am: 0aa06c56

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

Change-Id: I8143cf1f67b8f6bd552be2b39f773addcf814392