Merge "Sends the correct error code" into rvc-dev am: 50ec69fa09 am: 037503ebb7

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

Change-Id: I30131c8b92b271f967361824742e694c6c867991