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

Change-Id: I0d20849e34f6930a984465bf5075681dfecc9d26