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

Change-Id: I2ca927ec18767ac3228976c57564647d7add8ff9