Merge "Modify tests for SystemAppUpdateTracker." into tm-dev