Merge "Merge "Use appId to check if specific package belongs to special system users" into stage-aosp-rvc-ts-dev am: 2e4f029f30 am: 6823d68efe am: d107e54b2b" into rvc-d1-dev-plus-aosp am: 9eb745bf86 am: 21fbba5130

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12404646

Change-Id: Ic96646e67f53195ad0386b388978b08de44cb1c9