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

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

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