Merge "Use framework-res keep rules for system_server" am: 61dae344 am: 346994be am: 9860c436

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



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