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

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

Change-Id: I83e1a91cf9630e7c2628b47b44cea3cfa2bfe23d