Merge "build: add a few proguard rules [1/3]" into main am: 2b46f4d1 am:...

Merge "build: add a few proguard rules [1/3]" into main am: 2b46f4d1 am: 8a01fbd0 am: dc02b14f

Original change: https://android-review.googlesource.com/c/platform/build/+/2815690



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