Merge "Avoid -Wself-move for clang update" into main am: 8c5e39b8ab

Original change: https://android-review.googlesource.com/c/platform/external/private-join-and-compute/+/3120592

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