[automerger skipped] Merge "Disable hidden API checks on unit tests" am: 855f0f03e1  -s ours am: 44b1914000  -s ours
am: cee918d925  -s ours

Change-Id: I73c1742115d932a64f0788e1b26ebca32cc25773