Merge "Update tests using app-id and app-data." into main am: f91bb0208f am: badccbc68e

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3303373

Change-Id: I09d1be8a54c231ab7c5d72addcf995103880023f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>