[automerger skipped] Merge "expected.h - fix bugprone-branch-clone warning" into rvc-dev am: 61e2b010 -s ours
am skip reason: Change-Id Ie67a8bb1bf622319adea15466c42077e0e9b1a18 with SHA-1 4fc9b993 is in history
Change-Id: I42c60388181f6d8e292dcfe68267f2c0291f93ac