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 am: a85d5379

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

Change-Id: I239b6e929774ee5f7d85d896ed9c7e1f066b06f0