Merge "Persist test status to handle config interruptions" into nougat-cts-dev am: 4cad58e58d
am: 4a4fa0b6c6

Change-Id: I1876dde97163b238f105d9c94fd4cab58d760b78