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

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

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