Merge "keystore2-client-tests: To ensure test isolation, update the APPLICATION_ID value to avoid unintended matching with existing installed app UIDs." into main am: 2f9084b892 am: 83cda00fea

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

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