Merge "Fix Libbinder RemoveFromCacheOnServerDeath test" into main am: 2347908d77 am: 5a7b160272

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

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