Merge "Increase RemoveFromCacheOnServerDeath retry count" into main am: 7a8d900

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3290342

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

Author: Treehugger Robot

libs/binder/tests/binderCacheUnitTest.cpp

@@ -149,7 +149,7 @@ TEST_F(LibbinderCacheTest, RemoveFromCacheOnServerDeath) {
     EXPECT_EQ(OK, mServiceManager->addService(kCachedServiceName, binder2));
 
     // Confirm that new service is returned instead of old.
-    int retry_count = 5;
+    int retry_count = 20;
     sp<IBinder> result2;
     do {
         std::this_thread::sleep_for(std::chrono::milliseconds(50));