Merge "Refine system-server Proguard config for shrinking" am: 4033b9b412 am: fa287fe03b

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

Change-Id: I24a69c932c6c0e9b1caf75f0d7dc9da995803c66