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

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

Change-Id: I7c5cad6af38cfe43b2c010203da591b5a30f20ea