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: I533549d9190b2626ab67e30a5dde54a5f3c0de58