Merge "Fix emulator tests by setting system and non system app packages." into tm-dev