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

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

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