Merge "Include header ID when thowing invalid header exception" into main am: 7aa6a3164c

Original change: https://android-review.googlesource.com/c/platform/external/obex/+/2627770

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