Merge "Remove unnecessary std::move" into main am: 9b0609b038 am: 13ee1db08e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3213985

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