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

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

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