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

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

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



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