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

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



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