[automerger skipped] Merge "Add --no-test-api-acces to am instrument." am: 188abff5b2 am: 5c8ed7f6e7
am: c265820ec3 -s ours
am skip reason: change_id Id56ce3079bcea2632d4002edcf120d9d5c9e0a26 with SHA1 ab4d5afcf7 is in history

Change-Id: Ibe31558d248c09491094de096ae4387a9803731e