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

Change-Id: Ib771e1ec6e1340ecaa97d3b3bda4833742c91ca9