[automerger] Fix CTS regression caused by ag/4690195 am: 73939a628b

Change-Id: I5e7e32e7c1905e866dc2263bdf4d3719e806dd0c