[automerger skipped] Merge "Disable hidden API checks on unit tests" am: 855f0f03e1 -s ours
am: 44b1914000 -s ours
Change-Id: Id6a4bb03399d46a9e709cc13e6e338d884c3b87b
This commit is contained in: