Merge "libbinder: simpler scope_guard implementation" into main am: 429b663c

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



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