Merge "Add context for some errors." into main am: 0bd02ce74f

Original change: https://android-review.googlesource.com/c/platform/development/+/2796404

Change-Id: I217bbc06b4c99527fd05ac7e12b4a5e6a20c5419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>