Merge "Query for /default and /strongbox IRPCs directly" into main am: 77eb25fc04 am: a03d913d76

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

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