Merge "Add helper function to insert with retry." am: b6375273ac

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

Change-Id: I000c46d140e9c74b9481bc9afb4f3a76ce2a8112