Merge "libbinder: simpler scope_guard implementation" into main am: 429b663ca9 am: e9be336866

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

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