Switch to modern ArgumentMatchers
am: 3168f6ad52

Change-Id: Iae9ca74111abb94c5a81b4ee38817d430863a4b0