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

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17026521

Change-Id: I556d7dfcecacb2f790dec9a428b2cc1500594256