Make use of transaction merge data to more reliably find when a transaction was applied

Test: atest FlickerLibTest
Bug: 273961780
Bug: 278663063
Change-Id: I2833813d93ae462c01ea9d0b3b36671b2dca1132
4 files changed