Merge "Revert "Revert "API Lint: Enable for TestApi""" am: 8fa64738e9
am: e9e72a4856

Change-Id: I035ca7587db1301dc5e457b87e12d1320dba3763