Merge "Relax system_server keep rules" into main am: 6fdef47172 am: 567c7d2c46 am: 99d900c984

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

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