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

Change-Id: I2aa0c2e11f055e1cf232c86c3bae060a830e928c