Merge "Refine system service proguard rules" into main am: 5045c82657

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

Change-Id: Id053c8716a604ec91acd574a61b82e2e0c46c7c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>