Merge "Increase num_retries to reduce likelihood of test flake" am: f3e2a9d5

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2116279



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