Merge "Refine (optional) system_server Proguard config" am: e997efb8e8

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

Change-Id: I5cf5fe1af50eaf7d4adc131ad221fc001f686130