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

Change-Id: Ic71e2b4a6e5445539399c8c80d46e75eca87820a