Merge "Remove unnecessary std::move" into main am: 6f2b31f5 am: 736482a2

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



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