Merge "Further refine system_server Proguard rules" am: 0c2b673581 am: 924e7cabe7

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

Change-Id: Ic2ae82b2a05f3c39631df111b694d26c7cbe9c95