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

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

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