Snap for 7024209 from 0cb6eaf6fa71c30e71fdeb9076d0ce7966ed75a1 to androidx-master-release

Change-Id: I601b69bcb2492318fd021d05b12bf304070a20a1