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

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

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