Merge "Add context to error message." am: 07547144 am: 82e2afb2 am:...

Merge "Add context to error message." am: 07547144 am: 82e2afb2 am: e210ca9e am: e1cbf0b1 am: 3b33ddc2 am: a9cdb9e0

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



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