Merge "Keeping window service and permissions service in cache" into main am: a7c041abe8

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

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