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

Change-Id: I2bfa2c725b01c57e8ae70a8b077cbdccc179b192