Merge "[automerger skipped] resolve_callback_unit_test - fix...

Merge "[automerger skipped] resolve_callback_unit_test - fix bugprone-macro-parentheses warning am: 16ad9594 -s ours am: 57002496 -s ours" into rvc-d1-dev-plus-aosp am: 6cde6966 -s ours am: 06eda541 -s ours

am skip reason: Change-Id Icb925cbefc5297ba2b1957d278ba9409bc28688b with SHA-1 16ad9594 is in history

Change-Id: I337db1f4e4027623b2fc5c7a450f537cadf495ea