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

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



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