Merge "Remove unnecessary std::move" into main am: 6f2b31f5d3

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3213311

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