[automerger skipped] resolve_callback_unit_test - fix bugprone-macro-parentheses warning am: 16ad9594 -s ours
am skip reason: Change-Id Icb925cbefc5297ba2b1957d278ba9409bc28688b with SHA-1 b77afa0a is in history
Change-Id: Idf6e7043e6a62183bc41bd4f5564d7f1f853bfed