Merge "Remove all the extra accessor methods added by javac in support-cardview." into nyc-support-24.1-dev