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

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

Change-Id: I93b8d28be82e2781f07f7bf7f546b5d6e56cc63d