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

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

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