Merge "[getService] Retry get_interface in keystore2" into main am: 1628a576f0

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

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