[automerger skipped] Merge "Fix bugprone-use-after-move warnings" into rvc-dev-plus-aosp am: 8c6d5a4e am: 76fdaeb9 am: 89a1fde0 -s ours
am skip reason: Change-Id I185cb21521676ddbc4f2b7f098611a2efc7275e6 with SHA-1 c658184d is in history
Change-Id: I40edec4105f3da69b04fb934dbf5dd332c2d2d2b