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

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

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