Merge "Disable presubmit for ActivityRecordTests" into oc-dev
am: ef3874ba91

Change-Id: Ib2ec81465005ac046e6ed622bf2f1f92d463c284