Merge "Remove unnecessary system_server keep rules" am: 7591dd40

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



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