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

Merge "Remove unnecessary system_server keep rules" am: 7591dd40 am: 69c00da6 am: 8c6f4ee3 am: 07675bfa am: 5da35daa am: 970d9019

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



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