Merge "Do not remove User Manager and AppOps from Java cache" into main am: 1838dff0be

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

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