Merge "Relax system_server keep rules" into main am: 6fdef471 am: 567c7d2c

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



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