Merge "Refine (optional) system_server Proguard config" am: e997efb8e8 am: db85028b62 am: 4481a84007 am: 99b2c21de3

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

Change-Id: I349f4ff92940498fd28260fe81f8743a529d781e