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

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

Change-Id: I9513372e735cbb7f8334bb163003f5536da95bf1