Merge "Disable hidden API checks for Am"
am: 90771c270b

Change-Id: I45faf9ce659a280473c7d6a6a4093d50bbff95b0