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

Change-Id: Ifd4f44dc604220455adb2b4d56ee5583c53a4ac6