Merge "Add context to error message." am: 0754714469 am: 82e2afb277 am: e210ca9e34

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

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