[automerger skipped] Merge "Revert "Revert "API Lint: Enable for TestApi""" am: 8fa64738e9 am: e9e72a4856
am: 83610e2219 -s ours
am skip reason: change_id I61316a8f314dccb7718bf8ab159e167d554d2525 with SHA1 7c68a4023b is in history

Change-Id: I6f4671f3d8fe63db2891747f5c62aa858ec0be2c