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

Change-Id: I9ad7743e43efd5aaa722e73ea0b2543537d23c50