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

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



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