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

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

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