Merge "API Lint: update baseline for new checks" am: 6c089ac042 am: 4bbb2aaff2
am: b1a57f75e7

Change-Id: Iae083753bbbaa3f9279f5e5ea6b087732e8bb146