Merge "Use framework-res keep rules for system_server" am: 61dae344 am:...

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

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



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