Merge "Remove unnecessary std::move" into main am: 942e372dd8 am: eba7b771e6

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3251961

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