Merge "Relax system_server keep rules" into main am: 6fdef47172

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

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