Merge "Add additional instance info to log" into main am: da7ca1417c am: 0d28bd5122

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

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