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

Change-Id: I730daa68e058de77b1feabb800d31c504ef43160