tradefederation/contrib: Merge remote-tracking branch 'goog/master' into stage-aosp-master

Bug: 112171084
Test: None
Change-Id: I7814807f5e9acdb3998b89e56f2c655eb3c91be3