[automerger skipped] Merge "Add an eventuallyExpect call that returns null"...

[automerger skipped] Merge "Add an eventuallyExpect call that returns null" am: de54586b am: e75bc308 -s ours am: cc9a0a42 -s ours am: c2e83915 -s ours am: 1849e415 -s ours

am skip reason: Change-Id Ieba523cd6cebce5f5e6d2fd8b9acd28228403540 with SHA-1 d44175e9 is in history

Change-Id: I4d014d7bc90c8d9d5da4332c982f88071fc0121f