[automerger skipped] Merge "Allow ignoring return values when checking if class is mockable" am: e91c337d41 am: a8e1da9165
am: ee96bde575  -s ours

Change-Id: Ib2fb108b638b62fe857f5f930ef3662d862ddd02