Merge "Remove androidx rules from proguard_common.flags" into main