Merge "Swap default for disableTestApiChecks."
am: 972f7adfbf

Change-Id: Ic6ab43ecd38ab8e7f0437b0e9e3db1bc400d26c3