Merge "Remove Service Manager Cache in Java" into main am: 16fcdb2ffb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3309524

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