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: 5bc07863

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



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