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

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



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