[automerger] Fix CTS regression caused by ag/4690195 am: 73939a628b skipped: 4cfb6100df am: a7b3831011 am: 009e9d24ed

Change-Id: I59d463288c7ff8ea232e729409d813a0d6b7bbde