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