[automerger] Fix consumerir test bugs am: 43e1c6bc55 -s ours am: 547deb7528 am: 539c80039e

Change-Id: I878b5a89bbf345a9d8f6a0a0b3ce195f5051379b
This commit is contained in:
Android Build Merger (Role) 2018-01-23 22:13:58 +00:00
commit cf40299e6c

Diff content is not available