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

Change-Id: I2389e1b2acf285e7e5ba99d48950f19090f5085f