Merge "API Lint: Fix system-lint-baseline.txt"
am: 4b5bcc1cb2

Change-Id: If8052a23de91bd8d6d015236d36192d1d8342f4e