Merge "DO NOT MERGE Bump support library to 24.2.0 r36 for release" into nyc-support-24.1-dev
am: cd2dfdc791

Change-Id: I2ad08e8509867927a5d803247dfc10af67646648