[automerger skipped] Merge "DO NOT MERGE Fix robotests for AOSP"

am: 51b6c76660 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie8c749bbefa05cae3f5104be30dca0f08ae0a2c1
This commit is contained in:
Bernardo Rufino
2019-06-28 08:02:27 -07:00
committed by android-build-merger

Diff Content Not Available