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

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

Change-Id: I93e0b441034327dedf54d303742d84d8c2d58203