Snap for 7024209 from 5f0758d5aac114adfccba4e2d997ede2ec0969e1 to androidx-master-release

Change-Id: I2efc9c6579709bf55ab87fc0a68a0b706c905eeb