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

Change-Id: I6cc4e88d1cdeca605478ad280c1a044e57d7ed85