Merge "Add android.gsi.* keep rules to system server" into main am: 7c538b63ca

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

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