Merge "Add a better "method call" (optional) log" into main am: 5d12b205 am: 17eeaae9

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



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