Merge "servicemanager: include caller info in logs" into main am: dc829d6a92

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3015177

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