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

Change-Id: Iecfcb497096df75b12c0c2386c230bd50f38a5b5