Merge "No need to std::move local variable to return value" into main am: 608316b4fb

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

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