Merge "Clean up unnecessary proguard files in frameworks/base" into main am:...

Merge "Clean up unnecessary proguard files in frameworks/base" into main am: c5475899 am: d1176e77

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



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