Merge "Track lint API change" into studio-1.4-dev
automerge: 131c91c

* commit '131c91c90d03aac2176d91a276cef3f7fd7a15a8':
  Track lint API change