Merge "Remove all the extra accessor methods added by javac in support-media-compat." into nyc-support-24.1-dev
am: 752076acce

Change-Id: I51f0e8d16a0db98349bc278adba81ce0e577bb32