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

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>