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

Change-Id: I74d23c62529b73c7dce85ae0a05c547857413bbd