Merge "Remove unnecessary system_server keep rules" am: 7591dd408d am: 69c00da6ab am: 8c6f4ee34f

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

Change-Id: I00a61fde3df1132f2c3e06113e6d753b88eb037e
Signed-off-by: Automerger Merge Worker <[email protected]>